From: Jim Blandy <jimb@redhat.com>
Date: Tue, 25 May 1993 07:03:38 +0000 (+0000)
Subject: * xfaces.c (merge_faces): You can't tell if a font is a
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95994
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f126bd6787ff4e6ce17550566f5ba3e6769df9bc;p=emacs.git

* xfaces.c (merge_faces): You can't tell if a font is a
	character-cell font or not by testing whether or not it has a
	per_char table.  They all do.
	* xterm.c (x_new_font): Same deal.
---

diff --git a/src/xterm.c b/src/xterm.c
index 046cf5100a6..8f61d79d287 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3939,9 +3939,14 @@ x_new_font (f, fontname)
       XFontStruct *font;
 
       /* Try to find a character-cell font in the list.  */
+#if 0 
+      /* A laudable goal, but this isn't how to do it.  */
       for (i = 0; i < n_matching_fonts; i++)
 	if (! font_info[i].per_char)
 	  break;
+#else
+      i = 0;
+#endif
 
       if (i >= n_matching_fonts)
 	return 2;